Removed. (create_shortcuts_tree): Don't call the above.

2003-11-03  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkfilechooserdefault.c (shortcuts_select_folder): Removed.
	(create_shortcuts_tree): Don't call the above.
	(bookmarks_changed_cb): Likewise.
	(tree_selection_changed): Unselect everything from the shortcuts
	list.  This is the behavior that Mac OS has.
	(toolbar_add_item): Return the item.
	(toolbar_create): Store the up_button in the impl structure.
	(toolbar_check_sensitivity): New function to set the sensitivity
	of the "Up" button in the toolbar.
	(tree_selection_changed): Call toolbar_check_sensitivity().

diff --git a/ChangeLog b/ChangeLog
index 7a98b02e8360761b7b674cc2e67336c1fb746a57..298c3475627da2b8f8056c38e780cd1de0686b4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-11-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_select_folder): Removed.
+       (create_shortcuts_tree): Don't call the above.
+       (bookmarks_changed_cb): Likewise.
+       (tree_selection_changed): Unselect everything from the shortcuts
+       list.  This is the behavior that Mac OS has.
+       (toolbar_add_item): Return the item.
+       (toolbar_create): Store the up_button in the impl structure.
+       (toolbar_check_sensitivity): New function to set the sensitivity
+       of the "Up" button in the toolbar.
+       (tree_selection_changed): Call toolbar_check_sensitivity().
+
 2003-11-02  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): Do

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7a98b02e8360761b7b674cc2e67336c1fb746a57..298c3475627da2b8f8056c38e780cd1de0686b4c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+2003-11-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_select_folder): Removed.
+       (create_shortcuts_tree): Don't call the above.
+       (bookmarks_changed_cb): Likewise.
+       (tree_selection_changed): Unselect everything from the shortcuts
+       list.  This is the behavior that Mac OS has.
+       (toolbar_add_item): Return the item.
+       (toolbar_create): Store the up_button in the impl structure.
+       (toolbar_check_sensitivity): New function to set the sensitivity
+       of the "Up" button in the toolbar.
+       (tree_selection_changed): Call toolbar_check_sensitivity().
+
 2003-11-02  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): Do

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7a98b02e8360761b7b674cc2e67336c1fb746a57..298c3475627da2b8f8056c38e780cd1de0686b4c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+2003-11-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_select_folder): Removed.
+       (create_shortcuts_tree): Don't call the above.
+       (bookmarks_changed_cb): Likewise.
+       (tree_selection_changed): Unselect everything from the shortcuts
+       list.  This is the behavior that Mac OS has.
+       (toolbar_add_item): Return the item.
+       (toolbar_create): Store the up_button in the impl structure.
+       (toolbar_check_sensitivity): New function to set the sensitivity
+       of the "Up" button in the toolbar.
+       (tree_selection_changed): Call toolbar_check_sensitivity().
+
 2003-11-02  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): Do

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7a98b02e8360761b7b674cc2e67336c1fb746a57..298c3475627da2b8f8056c38e780cd1de0686b4c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+2003-11-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_select_folder): Removed.
+       (create_shortcuts_tree): Don't call the above.
+       (bookmarks_changed_cb): Likewise.
+       (tree_selection_changed): Unselect everything from the shortcuts
+       list.  This is the behavior that Mac OS has.
+       (toolbar_add_item): Return the item.
+       (toolbar_create): Store the up_button in the impl structure.
+       (toolbar_check_sensitivity): New function to set the sensitivity
+       of the "Up" button in the toolbar.
+       (tree_selection_changed): Call toolbar_check_sensitivity().
+
 2003-11-02  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): Do

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7a98b02e8360761b7b674cc2e67336c1fb746a57..298c3475627da2b8f8056c38e780cd1de0686b4c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+2003-11-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_select_folder): Removed.
+       (create_shortcuts_tree): Don't call the above.
+       (bookmarks_changed_cb): Likewise.
+       (tree_selection_changed): Unselect everything from the shortcuts
+       list.  This is the behavior that Mac OS has.
+       (toolbar_add_item): Return the item.
+       (toolbar_create): Store the up_button in the impl structure.
+       (toolbar_check_sensitivity): New function to set the sensitivity
+       of the "Up" button in the toolbar.
+       (tree_selection_changed): Call toolbar_check_sensitivity().
+
 2003-11-02  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): Do

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 2c0aac01ef5e2f279dfa2bd5d3bce1bdf6c889da..631a66080cf1265541b025346dcf14a3328fd799 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -92,6 +92,8 @@ struct _GtkFileChooserDefault
   GtkFilePath *current_folder;
   GtkFilePath *preview_path;
 
+  GtkToolItem *up_button;
+
   GtkWidget *preview_frame;
 
   GtkWidget *toolbar;
@@ -393,39 +395,14 @@ set_preview_widget (GtkFileChooserDefault *impl,
   update_preview_widget_visibility (impl);
 }
 
-/* Used from gtk_tree_model_foreach(); selects the item that corresponds to the
- * current path. */
-static gboolean
-set_current_shortcut_foreach_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+/* Clears the selection in the shortcuts tree */
+static void
+shortcuts_unselect_all (GtkFileChooserDefault *impl)
 {
-  GtkFileChooserDefault *impl;
-  GtkFilePath *model_path;
   GtkTreeSelection *selection;
 
-  impl = GTK_FILE_CHOOSER_DEFAULT (data);
-
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->shortcuts_tree));
-
-  gtk_tree_model_get (model, iter, SHORTCUTS_COL_PATH, &model_path, -1);
-
-  if (model_path && impl->current_folder && gtk_file_path_compare (model_path, impl->current_folder) == 0)
-    {
-      gtk_tree_selection_select_path (selection, path);
-      return TRUE;
-    }
-  else
-    gtk_tree_selection_unselect_path (selection, path);
-
-  return FALSE;
-}
-
-/* Selects the appropriate node in the shortcuts tree based on the current folder */
-static void
-shortcuts_select_folder (GtkFileChooserDefault *impl)
-{
-  gtk_tree_model_foreach (GTK_TREE_MODEL (impl->shortcuts_model),
-                         set_current_shortcut_foreach_cb,
-                         impl);
+  gtk_tree_selection_unselect_all (selection);
 }
 
 /* Convenience function to get the display name and icon info for a path */
@@ -670,7 +647,7 @@ toolbar_up_cb (GtkToolButton         *button,
 }
 
 /* Appends an item to the toolbar */
-static void
+static GtkToolItem *
 toolbar_add_item (GtkFileChooserDefault *impl,
                  const char            *stock_id,
                  GCallback              callback)
@@ -681,6 +658,8 @@ toolbar_add_item (GtkFileChooserDefault *impl,
   g_signal_connect (item, "clicked", callback, impl);
   gtk_toolbar_insert (GTK_TOOLBAR (impl->toolbar), item, -1);
   gtk_widget_show (GTK_WIDGET (item));
+
+  return item;
 }
 
 /* Creates the toolbar widget */
@@ -688,11 +667,33 @@ static GtkWidget *
 toolbar_create (GtkFileChooserDefault *impl)
 {
   impl->toolbar = gtk_toolbar_new ();
-  toolbar_add_item (impl, GTK_STOCK_GO_UP, G_CALLBACK (toolbar_up_cb));
+  impl->up_button = toolbar_add_item (impl, GTK_STOCK_GO_UP, G_CALLBACK (toolbar_up_cb));
 
   return impl->toolbar;
 }
 
+/* Sets the sensitivity of the toolbar buttons */
+static void
+toolbar_check_sensitivity (GtkFileChooserDefault *impl)
+{
+  GtkFilePath *parent_path;
+  gboolean has_parent;
+
+  has_parent = FALSE;
+
+  /* I don't think we need to check GError here, do we? */
+  if (gtk_file_system_get_parent (impl->file_system, impl->current_folder, &parent_path, NULL))
+    {
+      if (parent_path)
+       {
+         gtk_file_path_free (parent_path);
+         has_parent = TRUE;
+       }
+    }
+
+  gtk_widget_set_sensitive (GTK_WIDGET (impl->up_button), has_parent);
+}
+
 /* Creates the widgets for the filter combo box */
 static GtkWidget *
 create_filter (GtkFileChooserDefault *impl)
@@ -948,8 +949,6 @@ create_shortcuts_tree (GtkFileChooserDefault *impl)
   gtk_box_pack_start (GTK_BOX (hbox), impl->remove_bookmark_button, FALSE, FALSE, 0);
   gtk_widget_show (impl->remove_bookmark_button);
 
-  shortcuts_select_folder (impl);
-
   return vbox;
 }
 
@@ -1187,7 +1186,6 @@ bookmarks_changed_cb (GtkFileSystem         *file_system,
                      GtkFileChooserDefault *impl)
 {
   shortcuts_append_bookmarks (impl);
-  shortcuts_select_folder (impl);
 
   bookmarks_check_add_sensitivity (impl);
   bookmarks_check_remove_sensitivity (impl);
@@ -2098,7 +2096,8 @@ tree_selection_changed (GtkTreeSelection      *selection,
   /* Create the new list model */
   set_list_model (impl);
 
-  shortcuts_select_folder (impl);
+  shortcuts_unselect_all (impl);
+  toolbar_check_sensitivity (impl);
 
   g_signal_emit_by_name (impl, "current-folder-changed", 0);